am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs
am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '4e5a9b72afbd902227d8dcef6426d3a3be41daef':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base