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: 691044de am: 49240c0d

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



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