Merge changes from topic "top-focused-DevStMan" into sc-v2-dev am: c810e5c6dd am: dc540c0494

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

Change-Id: I0b73daf3583e5e113ca1f997bdeb2271b8032447