Merge "[ANAPIC Review] Change the type of List by ANAPIC review" am: 533ac6b000 am: d71e7edff1

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

Change-Id: Ief1868523ce48239a425552665690ebb7aaef4b5