Merge "Add missing device config permission" into tm-qpr-dev am: 74125f848d am: 3b3cc625e0

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

Change-Id: I40a3d8b992ed2587e52b306cd2de8b1de94e6781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>