Merge "Fixed booting logic on ActivityTaskSupervisor.activityIdleInternal()" into sc-v2-dev am: 5aeb77eb59

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

Change-Id: I690fbd4dec68ec461babe2c7ec5b4901421114bb