Merge changes from topic "egg-finally" into sc-dev am: a380ffbf am: 415843c5

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

Change-Id: Id9ceaba5b9ee8f115bdb5fedc66ea155e3720156