Merge "Fix resize info activity not showing in some cases" into rvc-dev am: 458938578f am: 80d86e375a

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

Change-Id: I00d0f67231154a89af1054613848d3639de195ae