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