Snap for 11210311 from 95536b57535fecf55b41c0c37e18cfe6d0f1a64b to 24D1-release

Change-Id: Ib03877dfd50c5c50ed289e4c73c078ad4be6e6de
tree: c20cc058a18eb9cc6e81cb0cbb8a25808ada6b83
  1. android-5.10/
  2. android-5.15/
  3. android-5.4/
  4. android-6.1/
  5. android-mainline/