[automerger skipped] Merge RQ2A.210305.007 am: f5941bf624 -s ours

am skip reason: Change-Id I9cd58a1c9be7347a13541e53b5876d965a11f35b with SHA-1 78aa4dafb7 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1613629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia700fb5d3ff30327507a8eb7ca370319a9b1f1e0