Merge changes from topic "egg-finally" into sc-dev am: a380ffbf am: 25ccf37b am: 00f722ee

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

Change-Id: Id0f0a83d4818c84aebd3cafeb93897c307f7b9a8