Merge "Reset the flag of attaching nav to app to prevent flickering" into...

Merge "Reset the flag of attaching nav to app to prevent flickering" into sc-dev am: 680d09ed am: f95e5a55

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

Change-Id: Ided822a906d1663182eeccf146613a71584177df