[automerger skipped] Merge "Add cmdline as a compilation reason" into sc-dev...

[automerger skipped] Merge "Add cmdline as a compilation reason" into sc-dev am: a376aeb6 am: 9de9ebb0 -s ours am: 49060001 -s ours

am skip reason: Merged-In I0cb6e9182530bc2d88975af185a0a8256fae2c2c with SHA-1 303a702a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14703952

Change-Id: Ibdf116af656391a2769fd4031131f94206e9ab09