[automerger skipped] Merge changes from topic "cgroup v2 freezer frameworks" into rvc-qpr-dev am: 7176835583 am: bf61b8c858 -s ours
am skip reason: Change-Id I7d588cc6e0499012dce64ed4e42ff2adb336062d with SHA-1 db203fcabf is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12392113
Change-Id: Ia187cc1f3c242107503d09f7c9510f85cf822e81
This commit is contained in: