Snap for 12517605 from adbfb1d942a19974bb5418cd12147eccb5d51138 to 25Q1-release

Change-Id: I3eaeeba1f2eaa4d9099ce50e6f68aa9c6a96c693
tree: 531dc2b05cc24dbafceb22bc14c606fae7775b0e
  1. include/
  2. Android.bp