tree e28f228526802286ea25d5b56b6ac322abea9f3d
parent 15add5d1a8962c5ebd2c931a7b9129ca29654ff6
parent 614fd1b51bf8576271238acf4e5a7baf82f4e4bd
author Yan Yan <evitayan@google.com> 1578615975 -0800
committer android-build-merger <android-build-merger@google.com> 1578615975 -0800

Merge changes from topic "include-uiccapptype"
am: 614fd1b51b

Change-Id: Ib8fc424672947c14e53dbb1586def62312b74083