Ignore-AOSP-First: UpsideDownCake Finalization Bug: 275409981 Test: build (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8bc31011a242dddb401273b5b6505b49b649ae67) Merged-In: Ic36cad45118f0220e44279a8b6ac89d22c3319d3 Change-Id: Ic36cad45118f0220e44279a8b6ac89d22c3319d3