Commit 1a3c8806 authored May 27, 2020 by Automerger Merge Worker Committed by Android (Google) Code Review May 27, 2020

Merge "Don't set shelf height if we are in landscape. am: e50d7a2f am:...

Merge "Don't set shelf height if we are in landscape. am: e50d7a2f am: f75d7c95 am: a9c0bbee" into rvc-qpr-dev-plus-aosp

There are no changes