Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788844 Change-Id: Id2f4e945fc893315f15f4f58e0f114187b5edb19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>