[automerger skipped] Merge "Fixed booting logic on ActivityTaskSupervisor.activityIdleInternal()" into sc-v2-dev am: 5aeb77eb59 am: 924065ec28 -s ours
am skip reason: Merged-In I4c589fd618b104689434bf918ebb48a64cef30e4 with SHA-1 1a6d740c4c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16067345
Change-Id: Ia168333c95899c051d7d072f535ef0e9a64eebdf
This commit is contained in: