Merge "Unhide LogSessionId constant." am: 2274d85fe6 am: fd51a9fc22

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

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