Merge "Scale light z value relative to screen size" into tm-qpr-dev am: ed5f49d9 am: 82b58cf3

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



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