Merge "Merge "Unhide LogSessionId constant." am: 2274d85f am: fd51a9fc am:...

Merge "Merge "Unhide LogSessionId constant." am: 2274d85f am: fd51a9fc am: ac7808eb" into tm-d1-dev-plus-aosp am: cd464c7f

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



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