Merge "Merge "Document a section of code" am: 7c379041 am: 5859be6c am:...

Merge "Merge "Document a section of code" am: 7c379041 am: 5859be6c am: 09eb6c1a" into tm-dev am: b7021e40 am: 82e3f8d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055047



Change-Id: Ic2cd52d9c272c0ea3d0c0ad1797253f861e5830b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>