Merge changes from topic "egg-finally" into sc-dev am: a380ffbf am: 2f9eb374

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

Change-Id: I8a0b76c72f982223a85cf48fdc55a80a3532da6f