[automerger skipped] Merge "Add cmdline as a compilation reason" into sc-dev am: a376aeb6 -s ours am: d7627397 -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: Ib68c9c48118f6374ef29ddbee93aa0a55675b1fd