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