[coastguard skipped] Merge sparse cherrypicks from sparse-14723106-L42500030087906740 into security-aosp-udc-release.

COASTGUARD_SKIP: I1fbe8720b6912a474446b63687aab7ffe336aea4
COASTGUARD_SKIP: I38b755ca3381cfca3300292873f763823fbf169b

Change-Id: I7f0cc6010f27d92c5cec640f036ec6798e1abaeb