Merge "Fix transparent view initial height" into tm-qpr-dev am: 32e3767ec3 am: 4b04ea318b

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

Change-Id: I134eadff33bc35133afc83070729d7c39174875b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>