Merge "Track API change." am: 8318e3087b am: 305cc54c0b am: 43995f88c9 am: 6f188d1769

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382

Change-Id: I1b80e92e69aa34777d0d0c572de6e3968355f8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>