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