Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d77b am: ecab80fe20

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

Change-Id: I40d19595dcc5673f632ffcbca1b855ce124c2561