Change-Id: I2ecf0b5287a181bf7a3273b5275c58bb36f57a5a Merged-In: I758861035f2e93139ec7c7f3648e04cbeff650db Test: Sync AOSP master with the manifest file Bug: 71703242