[automerger skipped] Merge "[ANAPIC Review] Change the type of List by ANAPIC review" am: 533ac6b000 am: d71e7edff1 am: 99af49b641 -s ours

am skip reason: skip tag Change-Id I5a52bc20ebd9c5ce000abd8588f2969d84c6bcd0 with SHA-1 33ee73cd9e is already in history

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

Change-Id: Ib50eae97940c57de53d83f25b89f56ea566de463