[automerged blank] Merge "canned_fs_config.cpp is written in C++" am:...

[automerged blank] Merge "canned_fs_config.cpp is written in C++" am: badd64bd am: cfce587a am: 960bd432 am: e598194c 2p: 5370c1b1

Blank merge reason: Change-Id I82a793cfdd7abd10024e304df7bd4ae323ffeabf with SHA-1 d8602917 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/16564488

Change-Id: I116bdf5845980dc1165968a5189f889820cab6b1