Merge changes from topic "presubmit-am-e0b0e974f22846dcb7bbfded989916f8" into sc-qpr1-dev am: 956229f738

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/16023745

Change-Id: I60c4ca6dd51351e3c3d532cd61aac93ead556b7a