Merge "Make umbra lighter when the blocker is too high and has no real umbra...
Merge "Make umbra lighter when the blocker is too high and has no real umbra area. am: 9c555566 am: 9ad59993" into nyc-mr1-dev-plus-aosp
am: 30422862
Change-Id: I46b32ede04a6b22fd427d4dbcbc091c0a3168571