[automerger skipped] Merge "glob pattern is used for AIDL files under frameworks/base" into qt-dev-plus-aosp am: 64772e440c am: b1be02cc9c
am: 4d8e42127f -s ours
am skip reason: change_id I59728ed06d66d44bc19bcd8530042c01add5fc2b with SHA1 1cc9566ee2 is in history

Change-Id: I18136e31e9dfa3a138fb49abeb1d82e385d67240