[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage"...

[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e212 -s ours am: f5fc2cb6 -s ours am: 37e01469 -s ours am: 967378ce -s ours

am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 d3252e3e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092

Change-Id: I1eac63f6c0dacab971824ff89bb1a209e4a57cd8