Merge "[MS68.3] Address comments at aosp/1958144" am: 0cc12cf02d

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

Change-Id: Idd8ef239098fe5806d099e9392662479dfedebbc