Merge "Make logging optional when checking for heads up" into tm-qpr-dev am:...

Merge "Make logging optional when checking for heads up" into tm-qpr-dev am: 8a786013 am: 011f4d2c

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



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