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

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

Change-Id: Iee1b4b823bf44b455f25fb6f2d40ba179ba729a8