Merge "Always updateRecording in...

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

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



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