Merge changes from topic "developer option for app freezer" into rvc-dev am: ce9b47859d am: 275f844df2

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

Change-Id: Iea8fdabc6f230564afcc6c42092f3daacd91edbe