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