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

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

Change-Id: I03ff5b8791631e4396d2b94670d055aec955450d