Merge changes from topic "egg-finally" into sc-dev am: a380ffbff1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389098

Change-Id: I27ebd5aad87a022fa7c11424051f1762594baab4