Merge "Add timeout to all ALS logging." into tm-qpr-dev am: 15be058244

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

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