Merge "Always updateRecording in...

Merge "Always updateRecording in ContentRecordingController#setContentRecordingSession" into udc-qpr-dev am: 6f729037

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



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