Merge "Merge "Do not expand NPV when unoccluding with bouncer" into qt-dev am: 0e9667a356" into qt-dev-plus-aosp
am: 2d4b628673

Change-Id: Ia9cd7a339007c2fbccb19b0a3dbfd7f3453eaf8e