Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b' * commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b': Fix issue #2845673: android:exported="false" is not obeyed
Merge commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b' * commit 'd172594e3a1e25f1f2c190e99421cb7d4963389b': Fix issue #2845673: android:exported="false" is not obeyed