Merge "[Sb refactor] address code comments" into tm-qpr-dev am: 44141cf1 am:...

Merge "[Sb refactor] address code comments" into tm-qpr-dev am: 44141cf1 am: 47203c5d am: c4d71f41

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



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