Merge "Disable flaky unit test in LocationManagerServiceTest" into udc-dev am: 7d760762 am: 14b73996

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



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