[automerger skipped] Merge "Limit framework module api packages" am: 9b193780e3 am: dbb4c1cf7b -s ours am: 2c7019a4a4 -s ours am: ca11b9ba50 -s ours
am skip reason: Change-Id Iedc8c309cef8290ac14e1ad32b5b66656145f557 with SHA-1 f79b08b7ab is in history
Change-Id: I33b58bb6d0f6205840f0f7a2f5138a3d0803eb7f
This commit is contained in: