Merge "DO NOT MERGE Do not reinflate the layout if it has not been already inflated." into rvc-qpr-dev am: ed260d837f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa728a75c7514ea433947333d082ee613305801c