Merge changes from topic "freezer path" am: bbae54c2f6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1578126

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e5751390ca227902aff9d062077de4148aed0f7