Merge changes from topic "am-e4c1655d637649b7a21fd18d80bbf66a"

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-7620ad0417cd498ea02e09cd0ecc98e9" into sc-v2-dev-plus-aosp am: bd1eff5c -s ours am: fffcedbd -s ours am: bf6f8ab0 -s ours
  [automerger skipped] [automerge] Ref count isolated uid use for long partial wakelocks 2p: f548942f am: 67266c96 -s ours am: caa26602 -s ours am: dd2b5177 -s ours