Merge "Fix MediaDrm.PlaybackComponent#setLogSessionId doc" am: a20d36c086 am: 5a297d5d39 am: dd7364cda4

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

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