Merge "Make umbra lighter when the blocker is too high and has no real umbra area. am: 9c555566bf am: 9ad599930d" into nyc-mr1-dev-plus-aosp
am: 304228628f

Change-Id: I46b32ede04a6b22fd427d4dbcbc091c0a3168571