[automerger skipped] Fix build for jetpack update am: b9f82bed98
-s ours am: 47c2b78f94
-s ours am: 8b4f036a3f
-s ours am: be5caf1230
-s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I13481950639eef78839601e8171484036437fed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: