[automerger skipped] Merge "RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-mr1-dev)" into oc-mr1-dev
am: edc22bf307  -s ours

Change-Id: I18a76bcf21c07d53fd1c0d50bf547aa4aa764f05