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

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

Change-Id: Ifa1963a9058911b34bf1359d292a6f4e97accc44