Make change and version bump to AP2A.240605.018.X1

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27197294', 'googleplex-android-review.googlesource.com/27198075', 'googleplex-android-review.googlesource.com/27198076', 'googleplex-android-review.googlesource.com/27198077', 'googleplex-android-review.googlesource.com/27198078'] into sparse-11799897-L62100030003582657.
SPARSE_CHANGE: If810780de164b74c3e3ebc35260384843de2c084
SPARSE_CHANGE: I18316e769438f62071723771762d6e89be98b813
SPARSE_CHANGE: I862f167062ee647af00a4ec7d4af2966c6be44a8
SPARSE_CHANGE: I0ef2a900568daccfbd2ef1d8949674e6f2a63e00
SPARSE_CHANGE: I1d84db76b157082fc7db1b3cb7c9afe8cdf46cbf

Change-Id: Id0929a1072dbdca630e59d68cd13eb9f5ca9af2d