Merge "Work-around for system property failures" into tm-qpr-dev am: 1b9cdb02a5 am: 1062bc02e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19583569 Change-Id: I8976715e32acf49768e69b5c5676dd5db1d5e117 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: