Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am:...
Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am: fcaa5a86 am: 36f7ed12" into rvc-d1-dev-plus-aosp am: 6031d0c4
Change-Id: I69831f120f3073c21ce1d7765b1dc47a676f31de