Merge "Merge "Fix the comments left on aosp/1481197" am: 51a4f05ef8 am: ba157d8b07" into rvc-d1-dev-plus-aosp am: 95fd9d13c5 am: 38aaba118c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494036 Change-Id: I18a1e42198fc6febc3d88e740f6750b046def0c0
This commit is contained in: