Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac
am: 19a610e0f1
am: 39522cb473
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573 Change-Id: I95e366318fd181c43db77383edf287f26615718c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: