Merge changes from topic "offbody-key-expiration" into main am: 8ec1eb1edb

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

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